Skip to content
This repository has been archived by the owner on Jan 7, 2022. It is now read-only.

Sync upstream #95

Merged
merged 1,748 commits into from
Mar 23, 2020
Merged

Sync upstream #95

merged 1,748 commits into from
Mar 23, 2020

Conversation

vext01
Copy link
Member

@vext01 vext01 commented Mar 20, 2020

An inoffensive sync with upstream.

RalfJung and others added 30 commits March 14, 2020 11:51
submodules: update clippy from 329923e to fdce47b

Changes:
````
add CR feedback
Improve documentation
Use `edition:2018` flag more widely
Update tests/ui/needless_doc_main.rs
Move links to the end of each chapter on adding_lints
Move links to the end of each chapter on CONTRIBUTING
Clean-up adding_lints.md
Clean-up CONTRIBUTING.md
needless_doc_main: only check rust code
Use `node_type_opt` over `node_type`
Fix doc
Fix ICE with trivial_bounds feature
clippy_lints: readme: don't mention crates.io since it is no longer used to publish clippy.
update rust-lang.github.io to rustc-dev-guide.rust-lang.org
Improve placeholder in map_unit_fn
Fix match single binding when in a let stmt
Improve error messages for {option,result}_map_unit_fn
Mention the setup instructions in CONTRIBUTING
redundant_pattern: take binding (ref, ref mut) into account in suggestion.
check_pat: delay creation of the "normal" vec until we reach the branch where is is actually needed
deps: bump itertools 0.8 -> 0.9
add lint on File::read_to_string and File::read_to_end
transition rustc-guide to rustc-dev-guide
Rename macro_use_import -> macro_use_imports
warn on macro_use attr
Fix deploy script for tag deploys
````

Fixes rust-lang#69957
Split librustc::{traits,infer} to their respective crates

Followup on #67953.

I tried to follow the existing module structures.

cc @eddyb
r? @Zoxc
adjust Miri to needs of changed unwinding strategy

As expected, rust-lang/rust#67502 broke unwinding in Miri. To fix it we have to adjust parts of the engine and the panic runtime, which this PR does. The Miri-side changes are in rust-lang/miri#1227.

Cc @oli-obk @Aaron1011 @Mark-Simulacrum @Amanieu
@vext01
Copy link
Member Author

vext01 commented Mar 21, 2020

bors try

bors bot added a commit that referenced this pull request Mar 21, 2020
@bors
Copy link
Contributor

bors bot commented Mar 21, 2020

try

Build failed

@vext01
Copy link
Member Author

vext01 commented Mar 22, 2020

bors try

bors bot added a commit that referenced this pull request Mar 22, 2020
@bors
Copy link
Contributor

bors bot commented Mar 22, 2020

try

Build failed

@vext01
Copy link
Member Author

vext01 commented Mar 22, 2020

error: internal compiler error: cannot lex source_file without source: /home/buildbot-worker8/.cargo/registry/src/github.com-1ecc6299db9ec823/ppv-lite86-0.2.6/src/x86_64/mod.rs

@bjorn3
Copy link
Collaborator

bjorn3 commented Mar 22, 2020

That is rust-lang/rust#69933, which was fixed by rust-lang/rust#70172.

@vext01
Copy link
Member Author

vext01 commented Mar 22, 2020

That is rust-lang/rust#69933, which was fixed by rust-lang/rust#70172.

Thanks! I'll re-sync tomorrow.

@vext01
Copy link
Member Author

vext01 commented Mar 23, 2020

bors try

bors bot added a commit that referenced this pull request Mar 23, 2020
@bors
Copy link
Contributor

bors bot commented Mar 23, 2020

try

Build succeeded

@vext01
Copy link
Member Author

vext01 commented Mar 23, 2020

Right, good. I've used git --rebase-merges to put that commit that I cherry-picked inside the merge commit. I also squashed the lock update into the merge.

Sound good? If so I will force-push.

(It was not easy...)

@ltratt
Copy link
Member

ltratt commented Mar 23, 2020

Since Lukas was already happy with this, please force push.

@vext01 vext01 force-pushed the yk-sync-upstream-20200320 branch from 14905b2 to b979dde Compare March 23, 2020 11:53
@vext01
Copy link
Member Author

vext01 commented Mar 23, 2020

There we go. Fingers crossed.

@ltratt
Copy link
Member

ltratt commented Mar 23, 2020

bors r+

bors bot added a commit that referenced this pull request Mar 23, 2020
95: Sync upstream r=ltratt a=vext01

An inoffensive sync with upstream.

Co-authored-by: Ralf Jung <post@ralfj.de>
Co-authored-by: Jonas Schievink <jonasschievink@gmail.com>
Co-authored-by: Camille GILLOT <gillot.camille@gmail.com>
Co-authored-by: bors <bors@rust-lang.org>
Co-authored-by: Vadim Petrochenkov <vadim.petrochenkov@gmail.com>
Co-authored-by: Guillaume Gomez <guillaume1.gomez@gmail.com>
Co-authored-by: Amanieu d'Antras <amanieu@gmail.com>
Co-authored-by: John Kåre Alsaker <john.kare.alsaker@gmail.com>
@bors
Copy link
Contributor

bors bot commented Mar 23, 2020

Build failed

@vext01
Copy link
Member Author

vext01 commented Mar 23, 2020

I missed a bit. Can I squash it in?

@ptersilie
Copy link
Member

Looks good to me.

@vext01 vext01 force-pushed the yk-sync-upstream-20200320 branch from ef021de to 9cc7be1 Compare March 23, 2020 13:46
@vext01
Copy link
Member Author

vext01 commented Mar 23, 2020

splat.

@ptersilie
Copy link
Member

bors r+

@bors
Copy link
Contributor

bors bot commented Mar 23, 2020

Build succeeded

@bors bors bot merged commit 5e82020 into softdevteam:master Mar 23, 2020
@vext01 vext01 deleted the yk-sync-upstream-20200320 branch March 23, 2020 14:21
@vext01
Copy link
Member Author

vext01 commented Mar 23, 2020

Yay :)

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.